Make refactoring