Tidy up the code some more.