Refactored
Renamed a few internal variables
More cleanup
Merge pull request #2 from arb/refactor

Refactored