tidy stuff up