#198 code review