[VYC] clean up the code