More cleanup, solidifying the example view.