Cleaned up card expire code