cleaned up and added to main makefile