Comments and cleanup.
Merge pull request #352 from mikeubell/master

Comments and cleanup.