Tidied-up a bit