tidied up views