Cleanup (mostly whitespace, comments)