Cleanup and readied makefile