#311 Code review comments