Tidied up master