Enhance code quality by optimizing logic and aligning with coding standards

[dilipbheda]

I've reviewed several files and noticed some coding standard issues that need to be addressed. Additionally, a few areas could benefit from logic improvements to enhance code efficiency and maintainability.