Refactoring of some smells without any change in functionality

[qurram-zaheer]

The code quality of this project was analyzed using DesigniteJava, and refactoring was done to reduce some code smells and attempt to improve code quality. The tests have all passed after each refactor. Apologies for any inconvenience caused.