JAL-98 small efficiency fix + commenting