Iteration 1 of code review for PR #57