#172 Code review