Cleaned up demo code.