Javadoc generated, code clarified.