Tidied up DemoItem