JAL-2053 JAL-1551 javadoc and simpler code