#311 Code review - round 2