tidied up with dirs