Fixed some minor inconsistencies in use of white space and naming.
Fixed a few major inconsistencies in naming.
Merge pull request #1 from olerass/master

Fix naming and white space