#166 Code review