Cleaned up code for demo