Demo - code clean up