Iteration 5, more code review feedback.