final code style changes
Merge pull request #415 from uberspot/master

final code style changes