More cleanup & new example.