Formatted makefile (content now mostly in order of build)