Some cleanup and demos