diff --git a/src/main/java/de/svenkubiak/jpushover/JPushover.java b/src/main/java/de/svenkubiak/jpushover/JPushover.java
index 9fc198f..b9a8599 100644
--- a/src/main/java/de/svenkubiak/jpushover/JPushover.java
+++ b/src/main/java/de/svenkubiak/jpushover/JPushover.java
@@ -61,7 +61,7 @@ public class JPushover {
      * @param token The pushover API token
      * @return JPushover instance
      */
-    public JPushover token(String token) {
+    public final JPushover token(String token) {
         this.pushoverToken = token;
         return this;
     }
@@ -74,7 +74,7 @@ public class JPushover {
      * @param user The username
      * @return JPushover instance
      */
-    public JPushover user(String user) {
+    public final JPushover user(String user) {
         this.pushoverUser = user;
         return this;
     }
@@ -86,7 +86,7 @@ public class JPushover {
      * @param retry Number of seconds
      * @return JPushover instance
      */
-    public JPushover retry(String retry) {
+    public final JPushover retry(String retry) {
         this.pushoverRetry = retry;
         return this;
     }
@@ -98,7 +98,7 @@ public class JPushover {
      * @param expire Number of seconds
      * @return JPushover instance
      */
-    public JPushover expire(String expire) {
+    public final JPushover expire(String expire) {
         this.pushoverExpire = expire;
         return this;
     }
@@ -110,7 +110,7 @@ public class JPushover {
      * @param message The message to sent
      * @return JPushover instance
      */
-    public JPushover message(String message) {
+    public final JPushover message(String message) {
         this.pushoverMessage = message;
         return this;
     }
@@ -123,7 +123,7 @@ public class JPushover {
      * @param device The device name
      * @return JPushover instance
      */
-    public JPushover device(String device) {
+    public final JPushover device(String device) {
         this.pushoverDevice = device;
         return this;
     }
@@ -135,7 +135,7 @@ public class JPushover {
      * @param title The title
      * @return JPushover instance
      */
-    public JPushover title(String title) {
+    public final JPushover title(String title) {
         this.pushoverTitle = title;
         return this;
     }
@@ -147,7 +147,7 @@ public class JPushover {
      * @param url The url
      * @return JPushover instance
      */
-    public JPushover url(String url) {
+    public final JPushover url(String url) {
         this.pushoverUrl = url;
         return this;
     }
@@ -158,7 +158,7 @@ public class JPushover {
      *
      * @return JPushover instance
      */
-    public JPushover html() {
+    public final JPushover html() {
         this.pushoverHtml = true;
         return this;
     }
@@ -169,7 +169,7 @@ public class JPushover {
      * @param urlTitle The url title
      * @return JPushover instance
      */
-    public JPushover urlTitle(String urlTitle) {
+    public final JPushover urlTitle(String urlTitle) {
         this.pushoverUrlTitle = urlTitle;
         return this;
     }
@@ -181,7 +181,7 @@ public class JPushover {
      * @param timestamp The Unix timestamp
      * @return JPushover instance
      */
-    public JPushover timestamp(String timestamp) {
+    public final JPushover timestamp(String timestamp) {
         this.pushoverTimestamp = timestamp;
         return this;
     }
@@ -193,7 +193,7 @@ public class JPushover {
      * @param priority The priority enum
      * @return JPushover instance
      */
-    public JPushover priority(Priority priority) {
+    public final JPushover priority(Priority priority) {
         this.pushoverPriority = priority;
         return this;
     }
@@ -206,7 +206,7 @@ public class JPushover {
      * @param sound THe sound enum
      * @return JPushover instance
      */
-    public JPushover sound(Sound sound) {
+    public final JPushover sound(Sound sound) {
         this.pushoverSound = sound;
         return this;
     }
@@ -220,7 +220,7 @@ public class JPushover {
      * @param callback The callback URL
      * @return JPushover instance
      */
-    public JPushover callback(String callback) {
+    public final JPushover callback(String callback) {
         this.pushoverCallback = callback;
         return this;
     }
@@ -277,7 +277,7 @@ public class JPushover {
         return pushoverSound;
     }
 
-    public boolean getHtml() {
+    public boolean isHtml() {
         return pushoverHtml;
     }
 
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Constants.java b/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
index 1f77e3b..844035b 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
@@ -29,6 +29,7 @@ public enum Constants {
         this.value = value;
     }
 
+    @Override
     public String toString() {
         return this.value;
     }
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Priority.java b/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
index 11e225d..86faf5d 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
@@ -18,6 +18,7 @@ public enum Priority {
         this.value = value;
     }
     
+    @Override
     public String toString() {
         return this.value;
     }
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Sound.java b/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
index d6d5476..2165841 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
@@ -35,6 +35,7 @@ public enum Sound {
         this.value = value;
     }
     
+    @Override
     public String toString() {
         return this.value;
     }
diff --git a/src/test/java/de/svenkubiak/jpushover/TestJPushover.java b/src/test/java/de/svenkubiak/jpushover/TestJPushover.java
index e31a650..4212043 100644
--- a/src/test/java/de/svenkubiak/jpushover/TestJPushover.java
+++ b/src/test/java/de/svenkubiak/jpushover/TestJPushover.java
@@ -1,6 +1,7 @@
 package de.svenkubiak.jpushover;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -64,6 +65,6 @@ public class TestJPushover {
         assertEquals(push.getUser(), USER);
 
         push.html();
-        assertEquals(push.getHtml(), true);
+        assertTrue(push.isHtml());
     }
 }
\ No newline at end of file