Code quality & readability check

[Lemon2311]

The code should be consistent, and be easy to understand and read, so a check and maybe a few tweaks are required, while maintaining the same code functionality and provide readability.