please do these kind of things in seperate whitespace patches if possible