diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 211d52f9e..b209a88cf 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -40,7 +40,6 @@ import static java.lang.Math.abs;
 /**
  * ************************************************************************************************
  * <p>
- * <p>
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  * <p>
@@ -621,7 +620,6 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
     /**
      * <p>Returns the default "path" portion of a lesson's URL.</p>
      * <p>
-     * <p>
      * Legacy webgoat lesson links are of the form
      * "attack?Screen=Xmenu=Ystage=Z". This method returns the path portion of
      * the url, i.e., "attack" in the string above.
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
index c00fc20f9..86fbd51cc 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java
@@ -78,9 +78,9 @@ public class LabelDebugService extends BaseService {
 
       /**
       * Sets the enabled flag on the label debugger to the given parameter
-      *
+      * @param enabled {@link org.owasp.webgoat.session.LabelDebugger} object
+      * @throws Exception unhandled exception
       * @return a {@link org.springframework.http.ResponseEntity} object.
-     * @throws Exception
       */
      @RequestMapping(value = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE, params = KEY_ENABLED)
      public @ResponseBody
@@ -92,7 +92,7 @@ public class LabelDebugService extends BaseService {
      }
 
     /**
-     * @param enabled
+     * @param enabled {@link org.owasp.webgoat.session.LabelDebugger} object
      * @return a {@link java.util.Map} object.
      */
     private Map<String, Object> createResponse(Boolean enabled) {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/service/RestartLessonService.java b/webgoat-container/src/main/java/org/owasp/webgoat/service/RestartLessonService.java
index 3c45f01cf..909433e54 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/service/RestartLessonService.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/service/RestartLessonService.java
@@ -47,7 +47,6 @@ public class RestartLessonService extends BaseService {
      * Returns current lesson
      *
      * @param session a {@link javax.servlet.http.HttpSession} object.
-     * @return a {@link java.lang.String} object.
      */
     @RequestMapping(value = "/restartlesson.mvc")
     @ResponseStatus(value = HttpStatus.OK)
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
index 4ee382c31..af030c7ea 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java
@@ -37,7 +37,7 @@ public class LabelDebugger implements Serializable {
 
     /**
      * <p>Sets the status to enabled</p>
-     * @param enabled
+     * @param enabled {@link org.owasp.webgoat.session.LabelDebugger} object
      */
     public void setEnabled(boolean enabled)  {
         this.enabled = enabled;