MDL-40297 whitespace, comments & var names cleanup