cleaning up some of vics code