Beginning the refactoring