cleaned up make system