diff --git a/partner-simplepay.js b/partner-simplepay.js
index fc630d9..067b6e9 100644
--- a/partner-simplepay.js
+++ b/partner-simplepay.js
@@ -133,12 +133,17 @@ function _composeCompleteSn(responseDataObj) {
     const cleanedData = {
         token: serial,
         cust_name: _getPropertyFromObjectSafe(info, 'cust_name'),
-        tariff: _getPropertyFromObjectSafe(info, 'kelas') + 'VA',
+        tariff: _getPropertyFromObjectSafe(info, 'kelas'),
         total_kwh: _getPropertyFromObjectSafe(info, 'size')
     }
 
+    if (cleanedData && cleanedData.tariff && typeof cleanedData === 'string' && (cleanedData.tariff.search(/VA$/) < 0) ) {
+        cleanedData.tariff += 'VA';
+
+    }
+
     if (cleanedData.cust_name) {
-        cleanedData.cust_name = cleanedData.cust_name.replace(/\W+/g, ' ').trim().replace(/\W+/g, '-').toUpperCase();
+        cleanedData.cust_name = cleanedData.cust_name.replace(/\W+/g, ' ').replace(/\W+/g, '-').replace(/-+$/, '').replace(/^-+/, '').toUpperCase();
     }
 
     if (cleanedData.total_kwh) {