diff --git a/src/web/SetContactDescriptionargs.java b/src/web/SetContactDescriptionargs.java
index 2745ab5..1c775fe 100644
--- a/src/web/SetContactDescriptionargs.java
+++ b/src/web/SetContactDescriptionargs.java
@@ -1,13 +1,14 @@
 package web;
 
-import additional.Somecodes;
+
+import static additional.Somecodes.ValidString;
 
 public record SetContactDescriptionargs(String contact, String description) {
 
     public int getContactID(){
         // contact is string like c1, c2, c3, etc.
         // regex it to extract the number
-        if (Somecodes.ValidString(contact)){
+        if (ValidString(contact)){
             var matcher = java.util.regex.Pattern.compile("c(\\d+)").matcher(contact);
             if (matcher.find()) {
                 try {
diff --git a/src/web/SetContactEmailargs.java b/src/web/SetContactEmailargs.java
index 54f36e8..1e85692 100644
--- a/src/web/SetContactEmailargs.java
+++ b/src/web/SetContactEmailargs.java
@@ -1,13 +1,15 @@
 package web;
 
-import additional.Somecodes;
+
+import static additional.Somecodes.ValidEmail;
+import static additional.Somecodes.ValidString;
 
 public record SetContactEmailargs(String contact, String email) {
 
     public int getContactID() {
         // contact is string like c1, c2, c3, etc.
         // regex it to extract the number
-        if (Somecodes.ValidString(contact)) {
+        if (ValidString(contact)) {
             var matcher = java.util.regex.Pattern.compile("c(\\d+)").matcher(contact);
             if (matcher.find()) {
                 try {
@@ -22,6 +24,6 @@ public record SetContactEmailargs(String contact, String email) {
     public boolean getEnabled() {
         // check if email is in valid format, then enabled.
         // otherwise disabled.
-        return Somecodes.ValidEmail(email);
+        return ValidEmail(email);
     }
 }
diff --git a/src/web/SetContactMqttargs.java b/src/web/SetContactMqttargs.java
index 9024693..3ab19c8 100644
--- a/src/web/SetContactMqttargs.java
+++ b/src/web/SetContactMqttargs.java
@@ -1,13 +1,14 @@
 package web;
 
-import additional.Somecodes;
+
+import static additional.Somecodes.ValidString;
 
 public record SetContactMqttargs(String contact, String mqtt) {
 
     public int getContactID() {
         // contact is string like c1, c2, c3, etc.
         // regex it to extract the number
-        if (Somecodes.ValidString(contact)) {
+        if (ValidString(contact)) {
             var matcher = java.util.regex.Pattern.compile("c(\\d+)").matcher(contact);
             if (matcher.find()) {
                 try {
diff --git a/src/web/SetContactVX3Kargs.java b/src/web/SetContactVX3Kargs.java
index 02ef998..e9b86ac 100644
--- a/src/web/SetContactVX3Kargs.java
+++ b/src/web/SetContactVX3Kargs.java
@@ -1,13 +1,14 @@
 package web;
 
-import additional.Somecodes;
+
+import static additional.Somecodes.*;
 
 public record SetContactVX3Kargs(String contact, String value) {
 
     public int getContactID() {
         // contact is string like c1, c2, c3, etc.
         // regex it to extract the number
-        if (Somecodes.ValidString(contact)) {
+        if (ValidString(contact)) {
             var matcher = java.util.regex.Pattern.compile("c(\\d+)").matcher(contact);
             if (matcher.find()) {
                 try {
@@ -25,14 +26,14 @@ public record SetContactVX3Kargs(String contact, String value) {
         // with FrameID is between Somecodes.MinVX3kFrameID and Somecodes.MaxVX3kFrameID
         // and RelayID is between Somecodes.MinVX3kRelayID and Somecodes.MaxVX3kRelayID
         // otherwise return false
-        if (Somecodes.ValidString(value)) {
+        if (ValidString(value)) {
             var parts = value.split(":");
             if (parts.length == 2) {
                 try {
                     int frameID = Integer.parseInt(parts[0]);
                     int relayID = Integer.parseInt(parts[1]);
-                    return frameID >= Somecodes.MinVX3kFrameID && frameID <= Somecodes.MaxVX3kFrameID &&
-                           relayID >= Somecodes.MinVX3kRelayID && relayID <= Somecodes.MaxVX3kRelayID;
+                    return frameID >= MinVX3kFrameID && frameID <= MaxVX3kFrameID &&
+                           relayID >= MinVX3kRelayID && relayID <= MaxVX3kRelayID;
                 } catch (NumberFormatException ignored) {
                     // Ignore and return false
                 }
@@ -43,7 +44,7 @@ public record SetContactVX3Kargs(String contact, String value) {
 
     public int getFrameID(){
         // from value with format "FrameID:RelayID" get the FrameID
-        if (Somecodes.ValidString(value)) {
+        if (ValidString(value)) {
             var parts = value.split(":");
             if (parts.length > 0) {
                 try {
@@ -58,7 +59,7 @@ public record SetContactVX3Kargs(String contact, String value) {
 
     public int getRelayID(){
         // from value with format "FrameID:RelayID" get the RelayID
-        if (Somecodes.ValidString(value)) {
+        if (ValidString(value)) {
             var parts = value.split(":");
             if (parts.length > 1) {
                 try {