Cleaned up the demo