- More refactoring and cleaning up of the code