Various aestetic changes in Makefile