#63 - code review done