style changes

* Temp changes while style is up for discussion
* Should probably have removed top comments as well