kholia Minor cleanups