Updated classpath.
Refactoring for style.