#319 Code review response