updated naming convention, formatting
Merge pull request #2 from toddbranch/master

updated naming convention, formatting