Cleaned up VC