#255 Code review