cleaning up cruft
Formatting.
Optimizing imports
Formatting.