Tidy up
Added demo