Refactored code to improve readability and maintainability

[KushSutaria]

Hello, I'm just starting my journey contributing to open-source projects and I've refactored certain methods and classes for better maintainability and/or readability. Kindly let me know how it goes. Thanks!