#199 - code review