Merge pull request #413 from uberspot/master

More code style fixes
final code style changes