Tidied up XML View code