#135 - code review