grand refactor