JAL-2480 inline one method, improve comments