Tidied up helper