Formatting cleanup and import organization.
- Used Spout's IntelliJ formatting.