cleaned up make