refactoring, moving on