Minor style fixes

* Line length fixes
* Refactored imports