diff --git a/java/com/google/scrollview/ScrollView.java b/java/com/google/scrollview/ScrollView.java
index e98af3dd58..0b4940cc57 100644
--- a/java/com/google/scrollview/ScrollView.java
+++ b/java/com/google/scrollview/ScrollView.java
@@ -56,7 +56,7 @@ public class ScrollView {
   /** Prints all received messages to the console if true. */
   static boolean debugViewNetworkTraffic = false;
 
-  /** Add a new message to the outgoing queue */
+  /** Add a new message to the outgoing queue. */
   public static void addMessage(SVEvent e) {
     if (debugViewNetworkTraffic) {
       System.out.println("(S->c) " + e.toString());
@@ -390,8 +390,7 @@ public static void main(String[] args) {
               "UTF8"));
     } catch (IOException e) {
       // Something went wrong and we were unable to set up a connection. This is
-      // pretty
-      // much a fatal error.
+      // pretty much a fatal error.
       // Note: The server does not get restarted automatically if this happens.
       e.printStackTrace();
       System.exit(1);
diff --git a/java/com/google/scrollview/events/SVEventHandler.java b/java/com/google/scrollview/events/SVEventHandler.java
index 26a92bdbca..53c7e68f35 100644
--- a/java/com/google/scrollview/events/SVEventHandler.java
+++ b/java/com/google/scrollview/events/SVEventHandler.java
@@ -36,7 +36,7 @@
  * The ScrollViewEventHandler takes care of any events which might happen on the
  * canvas and converts them to an according SVEvent, which is (using the
  * processEvent method) then added to a message queue. All events from the
- * message queue get sent gradually
+ * message queue get sent gradually.
  *
  * @author wanke@google.com
  */
@@ -60,7 +60,7 @@ public class SVEventHandler extends PBasicInputEventHandler implements
   private int lastXMove = 0;
   private int lastYMove = 0;
 
-  /** For Drawing a rubber-band rectangle for selection */
+  /** For Drawing a rubber-band rectangle for selection. */
   private int startX = 0;
   private int startY = 0;
   private float rubberBandTransparency = 0.5f;
@@ -274,7 +274,7 @@ public void windowClosing(WindowEvent e) {
     }
   }
 
-  /** These are all events we do not care about and throw away */
+  /** These are all events we do not care about and throw away. */
   public void keyReleased(KeyEvent e) {
   }
 
diff --git a/java/com/google/scrollview/ui/SVImageHandler.java b/java/com/google/scrollview/ui/SVImageHandler.java
index ed6b7c0452..981d75a592 100644
--- a/java/com/google/scrollview/ui/SVImageHandler.java
+++ b/java/com/google/scrollview/ui/SVImageHandler.java
@@ -27,7 +27,7 @@
  * @author wanke@google.com
  */
 public class SVImageHandler {
-  /* All methods are static, so we forbid to construct SVImageHandler objects */
+  /* All methods are static, so we forbid to construct SVImageHandler objects. */
   private SVImageHandler() {
   }
 
diff --git a/java/com/google/scrollview/ui/SVPopupMenu.java b/java/com/google/scrollview/ui/SVPopupMenu.java
index 14c8b3acd3..6584447e59 100644
--- a/java/com/google/scrollview/ui/SVPopupMenu.java
+++ b/java/com/google/scrollview/ui/SVPopupMenu.java
@@ -56,7 +56,7 @@ public class SVPopupMenu implements ActionListener {
    *
    * @param parent The menu we add our new entry to (should have been defined
    *        before). If the parent is "", we will add the entry to the root
-   *        (top-level)
+   *        (top-level).
    * @param name The caption of the new entry.
    * @param id The Id of the new entry. If it is -1, the entry will be treated
    *        as a menu.
@@ -64,14 +64,14 @@ public class SVPopupMenu implements ActionListener {
   public void add(String parent, String name, int id) {
     // A duplicate entry - we just throw it away, since its already in.
     if (items.get(name) != null) { return; }
-    // A new submenu at the top-level
+    // A new submenu at the top-level.
     if (parent.equals("")) {
       JMenu jli = new JMenu(name);
       SVAbstractMenuItem mli = new SVSubMenuItem(name, jli);
       items.put(name, mli);
       root.add(jli);
     }
-    // A new sub-submenu
+    // A new sub-submenu.
     else if (id == -1) {
       SVAbstractMenuItem jmi = items.get(parent);
       JMenu jli = new JMenu(name);
@@ -101,7 +101,7 @@ else if (id == -1) {
    *
    * @param parent The menu we add our new entry to (should have been defined
    *        before). If the parent is "", we will add the entry to the root
-   *        (top-level)
+   *        (top-level).
    * @param name The caption of the new entry.
    * @param id The Id of the new entry. If it is -1, the entry will be treated
    *        as a menu.