Style updates

* Removed trailing whitespace
* Fixed alphabetization of imports
* Fixed spacing between structures
* Fixed long lines
* Minor tweaks