Clean and tidy under the bonnet