#13 - More code review updates