Working on RSPV.
Cleaning up code.