Updated javadoc and clean up code in build.xml