Rename parameter and add style fixes
Merge pull request #1 from jwennerberg/small_fixes

Rename parameter and add style fixes