Responding to demobox code review