Fifth round of Javadoc writing + refactoring