Tidy some things.