fixup! Move analyzer and poll code into classes