Continue on refactoring the code to be cleaner, before adding new features