Fix simple style issues.
This commit applies the style guide univerally to the following topics:
1.) Import order.
2.) Broken indentation.