Code convention and spacing
Address data member naming convention mentioned in !11 (comment 34576). Also remove extraneous spacing in the template parameters.
Address data member naming convention mentioned in !11 (comment 34576). Also remove extraneous spacing in the template parameters.