Cleaned up for demo