Code cleanup and corrected classpath