Refactoring, expr and type of mini PVS updated