Better whitespace remove