whitespace, reindentation, and comments only
remove unneeded imports, clean up unused var warnings