more tidy for tute2