#294 - More code review updates