More code cleanup and review tags.  Part of code review, see #29.