improve whitespace stuff