diff --git a/Others/countwords.java b/Others/countwords.java
index a93aa1a33..da871047d 100644
--- a/Others/countwords.java
+++ b/Others/countwords.java
@@ -1,26 +1,26 @@
 import java.util.Scanner;
 
 /**
- * You enter a string into this program, and it will return how
- * many words were in that particular string
- * 
- * @author Marcus
+ * You enter a string into this program, and it will return how many words were
+ * in that particular string
  *
+ * @author Marcus
  */
-  public class countwords{
+public class CountWords {
 
-	public static void main(String[] args){
-	  Scanner input = new Scanner(System.in);
-          System.out.println("Enter your text: ");
-          String str = input.nextLine();
-          
-          System.out.println("Your text has " + wordCount(str) + " word(s)"); 
-	  input.close();
-        } 
+  public static void main(String[] args) {
+    Scanner input = new Scanner(System.in);
+    System.out.println("Enter your text: ");
+    String str = input.nextLine();
 
-        private static int wordCount(String s){
-          if(s.isEmpty() || s == null) return 0;
-          return s.trim().split("[\\s]+").length;
-        }
-        
+    System.out.println("Your text has " + wordCount(str) + " word(s)");
+    input.close();
   }
+
+  private static int wordCount(String s) {
+    if (s == null || s.isEmpty())
+      return 0;
+    return s.trim().split("[\\s]+").length;
+  }
+
+}
diff --git a/Others/crc32.java b/Others/crc32.java
index e27c24706..de98e4198 100644
--- a/Others/crc32.java
+++ b/Others/crc32.java
@@ -1,27 +1,29 @@
 import java.util.BitSet;
 
-//Generates a crc32 checksum for a given string or byte array
-public class crc32 {
-    
+/**
+ * Generates a crc32 checksum for a given string or byte array
+ */
+public class CRC32 {
+
     public static void main(String[] args) {
         System.out.println(Integer.toHexString(crc32("Hello World")));
     }
-    
+
     public static int crc32(String str) {
         return crc32(str.getBytes());
     }
-    
+
     public static int crc32(byte[] data) {
         BitSet bitSet = BitSet.valueOf(data);
-        int crc32 = 0xFFFFFFFF;                           //initial value
-        for(int i=0;i<data.length*8;i++) {
-            if(((crc32>>>31)&1) != (bitSet.get(i)?1:0))
-                crc32 = (crc32 << 1) ^ 0x04C11DB7;        //xoring with polynomial
+        int crc32 = 0xFFFFFFFF; // initial value
+        for (int i = 0; i < data.length * 8; i++) {
+            if (((crc32 >>> 31) & 1) != (bitSet.get(i) ? 1 : 0))
+                crc32 = (crc32 << 1) ^ 0x04C11DB7; // xor with polynomial
             else
                 crc32 = (crc32 << 1);
         }
-        crc32 = Integer.reverse(crc32);                   //result reflect
-        return crc32 ^ 0xFFFFFFFF;                        //final xor value
+        crc32 = Integer.reverse(crc32); // result reflect
+        return crc32 ^ 0xFFFFFFFF; // final xor value
     }
 
 }