Final tidy-up