#198 - code review