Clean up code for clarity
Merge pull request #3 from yahoo/cleanup

Clean up code for clarity