Fixup some Javadoc and refactor some lambdas