#240 Code review