Fix javadoc, avoid use of nested iterator, ensure use alias and indexes