style fixes
Merge pull request #1006 from adrianob/sytle_fixes

style fixes