Merge pull request #2 from markkho/master

leaned Up Code
Some more refactoring and renaming
Merge pull request #2 from brawner/master

Further refactoring and renaming