Tidy up helper classes and add to demo