Changes to conform with comments throughout the file