diff --git a/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java b/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java
index 93d8bd7..8d33a2d 100644
--- a/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java
@@ -10,9 +10,6 @@
 
 package com.jasonhhouse.gaps;
 
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Handles the process of searching, movies, counts, and canceling
  */
diff --git a/Core/src/main/java/com/jasonhhouse/gaps/Movie.java b/Core/src/main/java/com/jasonhhouse/gaps/Movie.java
index c1642ff..8da4064 100644
--- a/Core/src/main/java/com/jasonhhouse/gaps/Movie.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/Movie.java
@@ -77,10 +77,6 @@ public final class Movie implements Comparable<Movie> {
         this.overview = overview;
     }
 
-    public void setCollection(@Nullable String collection) {
-        this.collection = collection;
-    }
-
     public int getCollectionId() {
         return collectionId;
     }
@@ -105,15 +101,15 @@ public final class Movie implements Comparable<Movie> {
         return year;
     }
 
-    public void setPosterUrl(String posterUrl) {
-        this.posterUrl = posterUrl;
-    }
-
     @Nullable
     public String getCollection() {
         return collection;
     }
 
+    public void setCollection(@Nullable String collection) {
+        this.collection = collection;
+    }
+
     @Nullable
     public String getImdbId() {
         return imdbId;
@@ -165,6 +161,10 @@ public final class Movie implements Comparable<Movie> {
         return posterUrl;
     }
 
+    public void setPosterUrl(String posterUrl) {
+        this.posterUrl = posterUrl;
+    }
+
     @Override
     public String toString() {
         return "Movie{" +
diff --git a/Core/src/main/java/com/jasonhhouse/gaps/PlexSearch.java b/Core/src/main/java/com/jasonhhouse/gaps/PlexSearch.java
index 28423f9..b85b18d 100644
--- a/Core/src/main/java/com/jasonhhouse/gaps/PlexSearch.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/PlexSearch.java
@@ -16,10 +16,8 @@ import java.util.Set;
 public final class PlexSearch {
 
     public static final String MOVIE_DB_API_KEY = "movieDbApiKey";
-
-    private String movieDbApiKey;
-
     private final Set<PlexServer> plexServers;
+    private String movieDbApiKey;
 
     public PlexSearch() {
         plexServers = new HashSet<>();
diff --git a/Core/src/main/java/com/jasonhhouse/gaps/PlexServer.java b/Core/src/main/java/com/jasonhhouse/gaps/PlexServer.java
index 1fe63d4..ff3d042 100644
--- a/Core/src/main/java/com/jasonhhouse/gaps/PlexServer.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/PlexServer.java
@@ -26,34 +26,22 @@ public class PlexServer {
         plexLibraries = new TreeSet<>();
     }
 
-    public void setPlexToken(String plexToken) {
-        this.plexToken = plexToken;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public void setPort(Integer port) {
-        this.port = port;
+    public String getFriendlyName() {
+        return friendlyName;
     }
 
     public void setFriendlyName(String friendlyName) {
         this.friendlyName = friendlyName;
     }
 
-    public void setMachineIdentifier(String machineIdentifier) {
-        this.machineIdentifier = machineIdentifier;
-    }
-
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
     public String getMachineIdentifier() {
         return machineIdentifier;
     }
 
+    public void setMachineIdentifier(String machineIdentifier) {
+        this.machineIdentifier = machineIdentifier;
+    }
+
     public Set<PlexLibrary> getPlexLibraries() {
         return plexLibraries;
     }
@@ -62,14 +50,26 @@ public class PlexServer {
         return plexToken;
     }
 
+    public void setPlexToken(String plexToken) {
+        this.plexToken = plexToken;
+    }
+
     public String getAddress() {
         return address;
     }
 
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     public Integer getPort() {
         return port;
     }
 
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/Core/src/main/java/com/jasonhhouse/gaps/Rss.java b/Core/src/main/java/com/jasonhhouse/gaps/Rss.java
index 0c3290d..193979f 100644
--- a/Core/src/main/java/com/jasonhhouse/gaps/Rss.java
+++ b/Core/src/main/java/com/jasonhhouse/gaps/Rss.java
@@ -40,46 +40,46 @@ public class Rss {
         this.posterPath = posterPath;
     }
 
-    public void setImdbId(String imdbId) {
-        this.imdbId = imdbId;
-    }
-
-    public void setReleaseDate(Integer releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setTvdbId(Integer tvdbId) {
-        this.tvdbId = tvdbId;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
     public String getImdbId() {
         return imdbId;
     }
 
+    public void setImdbId(String imdbId) {
+        this.imdbId = imdbId;
+    }
+
     public Integer getReleaseDate() {
         return releaseDate;
     }
 
+    public void setReleaseDate(Integer releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
     public Integer getTvdbId() {
         return tvdbId;
     }
 
+    public void setTvdbId(Integer tvdbId) {
+        this.tvdbId = tvdbId;
+    }
+
     public String getTitle() {
         return title;
     }
 
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getPosterPath() {
         return posterPath;
     }
 
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;