#172 code review