refactor cvv