Several style fixes
Merge pull request #1 from rayslava/master

Several style fixes