Some refactoring in the ReachabilityPCE