Formatting and changes to Makefile