Javadocs and general formatting polish