CORE-4259: some minor code reformatting