JBIDE-11365 - small cleanup as per fred's comments on PR