#153 Code review