more style
cleaned up style changes
Merge remote-tracking branch 'ouzy/master'

* ouzy/master:
  cleaned up style changes
  more style