more changes to tidy