improve whitespace rules