Respond to Tobias and Spencer's code review