Tidied up some more. :-)