Tidied up rendering