Tidied stuff up