simplifications
whitespace..