cleanup and clarify
Merge pull request #160 from fearoffish/master

cleanup and clarify