Refactor the Stuff Class