Minor edits/JavaDoc