tidied up freds closet - refactered