#198 Code review