Javadocs and formatting