Block partial javadoc, minor refactoring