 			setTimeout ->
 				value   = $target.val()
 				value   = replaceFullWidthChars(value)
-				value   = $.payment.formatExpiry(value)
+				value   = ccUtils.formatExpiry(value)
+				safeVal(value, $target)
+
 
 		formatExpiry = (e) ->
 			# Only format if input is a number

				value   = $target.val()
				value   = replaceFullWidthChars(value)
				value   = ccUtils.formatCardNumber(value)

		formatCardNumber = (e) ->
			# Only format if input is a number

				value   = $target.val()
				value   = replaceFullWidthChars(value)
				value   = value.replace(/\D/g, '')
				safeVal(value, $target)

		# Format Card Number
		reFormatCardNumber = (e) ->
