#266 Code review