renaming, commenting, and code tightening based on code review.  Thanks\!