tidied up project