Tidied up some gubbins