Fixed a bunch of whitespace inconsistencies, generally tidied things up.