Resolve "Refactor classes and methods for better readability and code practice"

Shiza Ahmadrequested to merge
42-refactor-classes-and-methods-for-better-readability-and-code-practice into main

Closes #42 (closed)

Merge request reports