tidy up how we are handling whitespace