Cleaned up the makefile some.