tidied up following deps