Tidied up a bit!