I actually don't see this a style change since it is touching that code. Cleanups are OK as long as they are focused only on the code being touched.