refactoring, help