cleaned up demos, making them more consistent