refactoring, organizing