fixed javadocs, reset formatting