Complete JavaDocs, change scope of method