#146 Code review