Cleaning up make file definitions