Added javadoc, reformat XML