Tidied up, better performance