~ javadoc, minor readability changes