grand refactoring