refactoring make