#298 - more code review updates