Cleaning up code and demos (removing comments from code that have been
addressed)