tidying (incl. whitespace\!)