#161 Code review