Factor response into own class, cleanup.