Pull Request after refactoring codes in multiple classes

[Anshikaa-Sharmaa]

After looking for code smells in the project, I found places where refactoring could take place. Hence, after refactoring those classes and using multiple Refactoring Techniques, I am raising a PR to be reviewed and hopefully accepted.