Cleaned up make file