tidied up view