Implement code review fixes :-)