diff --git a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvElectronLoginDialog.java
index 9a605d54..4a609392 100644
--- a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvElectronLoginDialog.java
+++ b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvElectronLoginDialog.java
@@ -20,7 +20,7 @@ public class AmateurTvElectronLoginDialog {
 
     private static final Logger LOG = LoggerFactory.getLogger(AmateurTvElectronLoginDialog.class);
     public static final String DOMAIN = "amateur.tv";
-    public static final String URL = AmateurTv.baseUrl;
+    public static final String URL = AmateurTv.BASE_URL;
     private CookieJar cookieJar;
     private ExternalBrowser browser;
 
@@ -73,7 +73,7 @@ public class AmateurTvElectronLoginDialog {
                             b.secure();
                         }
                         Cookie c = b.build();
-                        cookieJar.saveFromResponse(HttpUrl.parse(AmateurTv.baseUrl), Collections.singletonList(c));
+                        cookieJar.saveFromResponse(HttpUrl.parse(AmateurTv.BASE_URL), Collections.singletonList(c));
                         LOG.debug("{}={}", c.name(), c.value());
                         if (Objects.equals(c.name(), "userType") && Objects.equals(c.value(), "registered")) {
                             loginSuccessful = true;
diff --git a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvTabProvider.java b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvTabProvider.java
index 1047cf9a..e1bf1d0c 100644
--- a/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvTabProvider.java
+++ b/client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvTabProvider.java
@@ -24,32 +24,32 @@ public class AmateurTvTabProvider extends AbstractTabProvider {
         List<Tab> tabs = new ArrayList<>();
 
         // all
-        var url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/A";
+        var url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/A";
         var updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         tabs.add(createTab("All", updateService));
 
         // female
-        url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/W";
+        url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/W";
         updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         tabs.add(createTab("Female", updateService));
 
         // male
-        url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/M";
+        url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/M";
         updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         tabs.add(createTab("Male", updateService));
 
         // couples
-        url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/C";
+        url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/C";
         updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         tabs.add(createTab("Couples", updateService));
 
         // trans
-        url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/T";
+        url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/T";
         updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         tabs.add(createTab("Trans", updateService));
 
         // followed
-        url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/F";
+        url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/F";
         updateService = new AmateurTvUpdateService((AmateurTv) site, url);
         updateService.requiresLogin(true);
         followedTab = new AmateurTvFollowedTab("Followed", updateService, site);
diff --git a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTv.java b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTv.java
index e7111780..d28fe669 100644
--- a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTv.java
+++ b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTv.java
@@ -12,7 +12,7 @@ import ctbrec.sites.AbstractSite;
 
 public class AmateurTv extends AbstractSite {
 
-    public static String baseUrl = "https://en.amateur.tv";
+    public static final String BASE_URL = "https://en.amateur.tv";
 
     private AmateurTvHttpClient httpClient;
 
@@ -29,14 +29,14 @@ public class AmateurTv extends AbstractSite {
 
     @Override
     public String getBaseUrl() {
-        return baseUrl;
+        return BASE_URL;
     }
 
     @Override
     public Model createModel(String name) {
         AmateurTvModel model = new AmateurTvModel();
         model.setName(name);
-        model.setUrl(baseUrl + '/' + name);
+        model.setUrl(BASE_URL + '/' + name);
         model.setDescription("");
         model.setSite(this);
         return model;
@@ -44,7 +44,7 @@ public class AmateurTv extends AbstractSite {
 
     @Override
     public Double getTokenBalance() throws IOException {
-        return Double.valueOf(0);
+        return 0d;
     }
 
     @Override
@@ -121,6 +121,6 @@ public class AmateurTv extends AbstractSite {
 
     @Override
     public String getAffiliateLink() {
-        return baseUrl;
+        return BASE_URL;
     }
 }
diff --git a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvDownload.java b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvDownload.java
index 74c601d0..edc7271a 100644
--- a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvDownload.java
+++ b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvDownload.java
@@ -140,7 +140,7 @@ public class AmateurTvDownload extends AbstractDownload {
                         .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
                         .header(ACCEPT, "*/*")
                         .header(ACCEPT_LANGUAGE, "en")
-                        .header(ORIGIN, AmateurTv.baseUrl)
+                        .header(ORIGIN, AmateurTv.BASE_URL)
                         .build();
                 try (Response resp = httpClient.execute(request)) {
                     if (resp.isSuccessful()) {
diff --git a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvHttpClient.java b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvHttpClient.java
index 0fa48ccd..37764a73 100644
--- a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvHttpClient.java
+++ b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvHttpClient.java
@@ -30,13 +30,13 @@ public class AmateurTvHttpClient extends HttpClient {
      * @throws IOException
      */
     public boolean checkLoginSuccess() throws IOException {
-        String url = AmateurTv.baseUrl + "/v3/readmodel/user/me";
+        String url = AmateurTv.BASE_URL + "/v3/readmodel/user/me";
         Request request = new Request.Builder()
                 .url(url)
                 .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
                 .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
                 .header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
-                .header(REFERER, AmateurTv.baseUrl)
+                .header(REFERER, AmateurTv.BASE_URL)
                 .build();
         try (Response response = execute(request)) {
             if (response.isSuccessful()) {
diff --git a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java
index a2b1360c..89fd52aa 100644
--- a/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java
+++ b/common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java
@@ -160,7 +160,7 @@ public class AmateurTvModel extends AbstractModel {
     }
 
     private JSONObject getModelInfo() throws IOException {
-        String url = AmateurTv.baseUrl + "/v3/readmodel/show/" + getName() + "/es";
+        String url = AmateurTv.BASE_URL + "/v3/readmodel/show/" + getName() + "/es";
         Request req = new Request.Builder().url(url)
                 .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
                 .header(ACCEPT, MIMETYPE_APPLICATION_JSON)