tidied up the decorator