Cleanup, indentation back to 4

Also, remove some unnecessary comments and imports.