Implemented Nigels feedback from code review.