and more whitespace removal