MDL-40542 white space changes and comments