Added formatting to demo

Demo now uses added formatting class