javadocs and formatting