Refactoring rebuild