Addressed a number of REVIEW comments that were added as part of the code review, see #26.