Polish for demo. Lots of cleanup.