Refactoring is serious business in this project.