#113 - code review