Added pvs: in front of pvs symbols
Cleanup