Cleaned up code, fixed CVV match error throwing