remove trailing whitespace; fiddle around with order