Updated makefile, cleaned repo