Demo and presentation cleaned up