Sorted out makefile.
Improvements to styling.