Various review notes and code cleanup, see #29.