Made stuff consistent
Improved Makefile