JAL-2484 minor house-keeping and code docs