tidied up dirs