#291 Code review comments