Tidied up even further