Cleaned up a few files, no actual functional changes

Just made sure keywords are in CAPITALS, and everything is nicely
indented.