Tidied up 2 views