some style guide fixes
Merge