tidied up app