Final tidy up.