Make executable refactoring