Some cleanup and demo