better function names and commenting
Merge pull request #1 from joshhartigan/master

better function names and commenting