Fix coding styles
Merge pull request #101 from rewish/fix_coding_styles

Fix coding styles