Better whitespace fix