diff --git a/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java b/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java
index 0ff2190c5..9b2abbcd9 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java
@@ -24,7 +24,10 @@ package com.omertron.themoviedbapi.model;
  */
 public enum ArtworkType {
 
-    POSTER,     // Poster artwork
-    BACKDROP,   // Fanart/backdrop
-    PROFILE     // Person image
+    // Poster artwork
+    POSTER,
+    // Fanart/backdrop
+    BACKDROP,
+    // Person image
+    PROFILE
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Person.java b/src/main/java/com/omertron/themoviedbapi/model/Person.java
index f3b941d5f..63fb7b751 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Person.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Person.java
@@ -48,12 +48,17 @@ public class Person extends AbstractJsonMapping {
     @JsonProperty("profile_path")
     private String profilePath = DEFAULT_STRING;
     private PersonType personType = PersonType.PERSON;
-    private String department = DEFAULT_STRING;  // Crew
-    private String job = DEFAULT_STRING;         // Crew
-    private String character = DEFAULT_STRING;   // Cast
-    private int order = -1;                      // Cast
+    // Crew
+    private String department = DEFAULT_STRING;
+    // Crew
+    private String job = DEFAULT_STRING;
+    // Cast
+    private String character = DEFAULT_STRING;
+    // Cast
+    private int order = -1;
     @JsonProperty("adult")
-    private boolean adult = false;  // Person info
+    // Person info
+    private boolean adult = false;
     @JsonProperty("also_known_as")
     private List<String> aka = new ArrayList<String>();
     @JsonProperty("biography")
diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonType.java b/src/main/java/com/omertron/themoviedbapi/model/PersonType.java
index f1aea34d8..a34097550 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/PersonType.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/PersonType.java
@@ -24,7 +24,10 @@ package com.omertron.themoviedbapi.model;
  */
 public enum PersonType {
 
-    CAST, // A member of the cast
-    CREW, // A member of the crew
-    PERSON  // No specific type
+    // A member of the cast
+    CAST,
+    // A member of the crew
+    CREW,
+    // No specific type
+    PERSON
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
index 503404657..82b2d8ee5 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
@@ -37,7 +37,8 @@ public class Trailer extends AbstractJsonMapping {
     private String name;
     private String size;
     private String source;
-    private String website;    // The website of the trailer
+    // The website of the trailer
+    private String website;
     private String type;
 
     public String getName() {
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java b/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java
index 03a68779e..08d061238 100644
--- a/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java
+++ b/src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java
@@ -51,8 +51,10 @@ public final class WebBrowser {
     private static String proxyUsername = null;
     private static String proxyPassword = null;
     private static String proxyEncodedPassword = null;
-    private static int webTimeoutConnect = 25000;   // 25 second timeout
-    private static int webTimeoutRead = 90000;      // 90 second timeout
+    // 25 second timeout
+    private static int webTimeoutConnect = 25000;
+    // 90 second timeout
+    private static int webTimeoutRead = 90000;
 
     // Hide the constructor
     protected WebBrowser() {