Tidied up the viz a little