Fixes to variable names
Merge pull request #16 from aasav/master

Fixes to variable names and minor style