Better whitespace removal