#138 code review