Tidied up some things.