Updated commit with code review feedback.