#220 Code review