FIx some misnamed properties.
Just code cleanup, white space et al. No functional changes.
Merge pull request #2 from tonydew/cleanup

Just code cleanup, white space et al. No functional changes.