Clean up code and no more refactoring