General tidyup.