Modernise and tidy up.