update candv dependency & tidy up