fix #637
Styleguide fixes
Merge pull request #645 from Ashatta/master

Fix #637