javadoc, smaller refactorings