Refactor per Oscar's infinite wisdom