Hi @kushagraj, thanks for doing all the improvements here. I have some general suggestions:

1) I would suggest you to keep the changesets small. This one is particularly big.

2) Specify what changes you have made here. "work in sector 24" is not very clear is difficult to review.