Fixes to styling, Makefile

Fixes to styling (mostly the one where we said we'd do 2 spaces for
tabbing/indentation)
Updated the header comment slightly (add the UINs that we have)
Fixed Makefile (clean section)