refactoring fixpoint-solver ep. 1