Javadocs and cleanup.