minor code cleanup

and updated a couple comments.  moved changes to readme.md