Improve code and increase test coverage

Several sections of the code have been pinpointed that require refactoring to enhance their maintainability and future scalability. Furthermore, it's been noted that an expansion of unit testing is necessary to ensure that changes to the module do not introduce any regressions.