Improvement in the backend code base

[indpurvesh]

This issue is just a place holder for backend code improvements. As we find anything to improve we will create a sub issue and worked on it.