Responding to demobox's code review