Cleaned the rest of the java source files