refactoring, and time management