MDL-30273 whitespace cleanup