Updated JavaDocs to reflect refactoring