Iteration 2 of code review for PR #57