diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index ab734d5061..2877c8776e 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -430,15 +430,14 @@ export default class AutofillService implements AutofillServiceInterface {
                     ['cc-name', 'card-name', 'cardholder-name', 'cardholder'])) {
                     fillFields.cardholderName = f;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
-                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no', 'card-no', 'credit-card',
-                        'numero-carte', 'carte', 'carte-credit'],
+                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no', 'card-no',
+                        'credit-card', 'numero-carte', 'carte', 'carte-credit'],
                     ['cc-number', 'cc-num', 'card-number', 'card-num', 'cc-no', 'card-no', 'credit-card',
                         'carte-credit', 'numero-carte'])) {
                     fillFields.number = f;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
                     ['cc-exp', 'card-exp', 'cc-expiration', 'card-expiration', 'cc-ex', 'card-ex', 'card-expire',
-                        'validite', 'expiration'],
-                    [])) {
+                        'validite', 'expiration'], [])) {
                     fillFields.exp = f;
                 } else if (!fillFields.expMonth && this.isFieldMatch(f[attr],
                     ['exp-month', 'cc-exp-month', 'cc-month', 'card-month', 'cc-mo', 'card-mo', 'exp-mo',
@@ -451,13 +450,13 @@ export default class AutofillService implements AutofillServiceInterface {
                     ['exp-year', 'cc-exp-year', 'cc-year', 'card-year', 'cc-yr', 'card-yr', 'exp-yr',
                         'card-exp-yr', 'cc-exp-yr', 'card-expiration-year', 'expiration-year',
                         'cc-yy', 'cc-y', 'card-yy', 'card-y', 'card-exp-yy', 'cc-exp-yy', 'exp-yy', 'exp-y',
-                        'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy',
-                        'expire-year', 'expire-yr', 'card-expire-year', 'card-expire-yr', 'an-validite',
-                        'an-expiration', 'annee-validite', 'annee-expiration'])) {
+                        'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy', 'expire-year', 'expire-yr',
+                        'card-expire-year', 'card-expire-yr', 'an-validite', 'an-expiration', 'annee-validite',
+                        'annee-expiration'])) {
                     fillFields.expYear = f;
                 } else if (!fillFields.code && this.isFieldMatch(f[attr],
-                    ['cvv', 'cvc', 'cvv2', 'cc-csc', 'cc-cvv', 'card-csc', 'card-cvv', 'cvd',
-                        'cid', 'cvc2', 'cnv', 'cvn2', 'cc-code', 'card-code'])) {
+                    ['cvv', 'cvc', 'cvv2', 'cc-csc', 'cc-cvv', 'card-csc', 'card-cvv', 'cvd', 'cid', 'cvc2', 'cnv',
+                        'cvn2', 'cc-code', 'card-code'])) {
                     fillFields.code = f;
                 } else if (!fillFields.brand && this.isFieldMatch(f[attr],
                     ['cc-type', 'card-type', 'card-brand', 'cc-brand'])) {