#177 Code review