Ongoing tidy up.