Reasoner code clean up