Javadocs, code cleanup.