#114 Code review