tidied stuff up