Misc code cleanup, mostly whitespace preferences, removing unused imports, plus a few fixes here and there.