fix style guide
Merged with master