More JavaDoc work