diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java
index 8d324dc70..7a8d62597 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java
@@ -65,7 +65,7 @@ public class TmdbCertifications extends AbstractMethod {
             JsonNode node = MAPPER.readTree(webpage);
             Map<String, List<Certification>> results = MAPPER.readValue(node.elements().next().traverse(), new TypeReference<Map<String, List<Certification>>>() {
             });
-            return new ResultsMap<String, List<Certification>>(results);
+            return new ResultsMap<>(results);
         } catch (IOException ex) {
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get movie certifications", url, ex);
         }
@@ -85,7 +85,7 @@ public class TmdbCertifications extends AbstractMethod {
             JsonNode node = MAPPER.readTree(webpage);
             Map<String, List<Certification>> results = MAPPER.readValue(node.elements().next().traverse(), new TypeReference<Map<String, List<Certification>>>() {
             });
-            return new ResultsMap<String, List<Certification>>(results);
+            return new ResultsMap<>(results);
         } catch (IOException ex) {
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV certifications", url, ex);
         }
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
index 24c781c59..d36e478a1 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
@@ -97,7 +97,7 @@ public class TmdbCollections extends AbstractMethod {
 
         try {
             WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
-            ResultList<Artwork> results = new ResultList<Artwork>(wrapper.getAll(ArtworkType.POSTER, ArtworkType.BACKDROP));
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll(ArtworkType.POSTER, ArtworkType.BACKDROP));
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
index b23a8a870..04f65029d 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
@@ -95,7 +95,7 @@ public class TmdbConfiguration extends AbstractMethod {
 
         try {
             WrapperJobList wrapper = MAPPER.readValue(webpage, WrapperJobList.class);
-            ResultList<JobDepartment> results = new ResultList<JobDepartment>(wrapper.getJobs());
+            ResultList<JobDepartment> results = new ResultList<>(wrapper.getJobs());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -121,7 +121,7 @@ public class TmdbConfiguration extends AbstractMethod {
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get timezone list", url, ex);
         }
 
-        ResultsMap<String, List<String>> timezones = new ResultsMap<String, List<String>>();
+        ResultsMap<String, List<String>> timezones = new ResultsMap<>();
 
         for (Map<String, List<String>> tzMap : tzList) {
             for (Map.Entry<String, List<String>> x : tzMap.entrySet()) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java
index 55e5f8129..e0c6ac6c3 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java
@@ -28,7 +28,6 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
 import java.io.IOException;
 import java.net.URL;
-import org.slf4j.LoggerFactory;
 import org.yamj.api.common.exception.ApiExceptionType;
 
 /**
@@ -78,7 +77,6 @@ public class TmdbCredits extends AbstractMethod {
         try {
             return MAPPER.readValue(webpage, CreditInfo.class);
         } catch (IOException ex) {
-            LoggerFactory.getLogger("test").info("{}",ex);
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credit info", url, ex);
         }
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
index 32cac1636..46e1b2a59 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
@@ -42,7 +42,6 @@ import com.omertron.themoviedbapi.results.WrapperImages;
 import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
-import org.slf4j.LoggerFactory;
 import org.yamj.api.common.exception.ApiExceptionType;
 
 /**
@@ -89,7 +88,6 @@ public class TmdbEpisodes extends AbstractMethod {
         try {
             return MAPPER.readValue(webpage, TVEpisodeInfo.class);
         } catch (IOException ex) {
-            LoggerFactory.getLogger("test").warn("{}", ex);
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV Episode Info", url, ex);
         }
     }
@@ -207,7 +205,7 @@ public class TmdbEpisodes extends AbstractMethod {
 
         try {
             WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
-            ResultList<Artwork> results = new ResultList<Artwork>(wrapper.getAll());
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -274,7 +272,7 @@ public class TmdbEpisodes extends AbstractMethod {
 
         try {
             WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
-            ResultList<Video> results = new ResultList<Video>(wrapper.getVideos());
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
index c5a80403c..445b3aaaf 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
@@ -91,7 +91,7 @@ public class TmdbGenres extends AbstractMethod {
 
         try {
             WrapperGenres wrapper = MAPPER.readValue(webpage, WrapperGenres.class);
-            ResultList<Genre> results = new ResultList<Genre>(wrapper.getGenres());
+            ResultList<Genre> results = new ResultList<>(wrapper.getGenres());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
index 6cd79b920..c9613a52a 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
@@ -184,7 +184,7 @@ public class TmdbMovies extends AbstractMethod {
         String webpage = httpTools.getRequest(url);
         try {
             WrapperAlternativeTitles wrapper = MAPPER.readValue(webpage, WrapperAlternativeTitles.class);
-            ResultList<AlternativeTitle> results = new ResultList<AlternativeTitle>(wrapper.getTitles());
+            ResultList<AlternativeTitle> results = new ResultList<>(wrapper.getTitles());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -231,7 +231,7 @@ public class TmdbMovies extends AbstractMethod {
 
         try {
             WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
-            ResultList<Artwork> results = new ResultList<Artwork>(wrapper.getAll());
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -258,7 +258,7 @@ public class TmdbMovies extends AbstractMethod {
 
         try {
             WrapperMovieKeywords wrapper = MAPPER.readValue(webpage, WrapperMovieKeywords.class);
-            ResultList<Keyword> results = new ResultList<Keyword>(wrapper.getKeywords());
+            ResultList<Keyword> results = new ResultList<>(wrapper.getKeywords());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -285,7 +285,7 @@ public class TmdbMovies extends AbstractMethod {
 
         try {
             WrapperReleaseInfo wrapper = MAPPER.readValue(webpage, WrapperReleaseInfo.class);
-            ResultList<ReleaseInfo> results = new ResultList<ReleaseInfo>(wrapper.getCountries());
+            ResultList<ReleaseInfo> results = new ResultList<>(wrapper.getCountries());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -314,7 +314,7 @@ public class TmdbMovies extends AbstractMethod {
 
         try {
             WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
-            ResultList<Video> results = new ResultList<Video>(wrapper.getVideos());
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -339,7 +339,7 @@ public class TmdbMovies extends AbstractMethod {
 
         try {
             WrapperTranslations wrapper = MAPPER.readValue(webpage, WrapperTranslations.class);
-            ResultList<Translation> results = new ResultList<Translation>(wrapper.getTranslations());
+            ResultList<Translation> results = new ResultList<>(wrapper.getTranslations());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
index ca3d15ec7..ae578d797 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
@@ -203,13 +203,14 @@ public class TmdbSearch extends AbstractMethod {
 
         try {
             WrapperMultiSearch wrapper = MAPPER.readValue(webpage, WrapperMultiSearch.class);
-            ResultList<MediaBasic> results = new ResultList<MediaBasic>();
+            ResultList<MediaBasic> results = new ResultList<>();
             results.getResults().addAll(wrapper.getResults());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get multi search", url, ex);
-        }    }
+        }
+    }
 
     /**
      * This is a good starting point to start finding people on TMDb.
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
index 7f4301632..5beaa398b 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
@@ -99,8 +99,7 @@ public class TmdbSeasons extends AbstractMethod {
     }
 
     /**
-     * This method lets users get the status of whether or not the TV episodes
-     * of a season have been rated.
+     * This method lets users get the status of whether or not the TV episodes of a season have been rated.
      *
      * A valid session id is required.
      *
@@ -147,8 +146,7 @@ public class TmdbSeasons extends AbstractMethod {
     }
 
     /**
-     * Get the external ids that we have stored for a TV season by season
-     * number.
+     * Get the external ids that we have stored for a TV season by season number.
      *
      * @param tvID
      * @param seasonNumber
@@ -194,7 +192,7 @@ public class TmdbSeasons extends AbstractMethod {
 
         try {
             WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
-            ResultList<Artwork> results = new ResultList<Artwork>(wrapper.getAll());
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -203,8 +201,7 @@ public class TmdbSeasons extends AbstractMethod {
     }
 
     /**
-     * Get the videos that have been added to a TV season (trailers, teasers,
-     * etc...)
+     * Get the videos that have been added to a TV season (trailers, teasers, etc...)
      *
      * @param tvID
      * @param seasonNumber
@@ -223,7 +220,7 @@ public class TmdbSeasons extends AbstractMethod {
 
         try {
             WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
-            ResultList<Video> results = new ResultList<Video>(wrapper.getVideos());
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
index 22deae4e0..4f62bb34a 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
@@ -231,7 +231,7 @@ public class TmdbTV extends AbstractMethod {
 
         try {
             WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
-            ResultList<Artwork> results = new ResultList<Artwork>(wrapper.getAll());
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -327,7 +327,7 @@ public class TmdbTV extends AbstractMethod {
 
         try {
             WrapperTranslations wrapper = MAPPER.readValue(webpage, WrapperTranslations.class);
-            ResultList<Translation> results = new ResultList<Translation>(wrapper.getTranslations());
+            ResultList<Translation> results = new ResultList<>(wrapper.getTranslations());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
@@ -354,7 +354,7 @@ public class TmdbTV extends AbstractMethod {
 
         try {
             WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
-            ResultList<Video> results = new ResultList<Video>(wrapper.getVideos());
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
             wrapper.setResultProperties(results);
             return results;
         } catch (IOException ex) {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonInfo.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonInfo.java
index 4b9eec4a9..36ca57837 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonInfo.java
@@ -66,7 +66,6 @@ public class PersonInfo extends PersonBasic implements Serializable, AppendToRes
     private final Set<PeopleMethod> methods = EnumSet.noneOf(PeopleMethod.class);
     // AppendToResponse Properties
     private List<ChangeKeyItem> changes = Collections.emptyList();
-    // TODO: Add COMBINED_CREDITS
     private ExternalID externalIDs = new ExternalID();
     private List<Artwork> images = Collections.emptyList();
     private List<ArtworkMedia> taggedImages = Collections.emptyList();