Cleaning up CVH code