Cleanup. Move Request to separate class.