Tidied up some more..