#216 Code review