Refactoring + Javadoc comments.