tidy stuff up a bit