Cleanup and make file improvement