CDI-357, minor language cleanup