Tidied up!(again)