Time for refactoring