Issue #13 Code review comments