Formatting changes in example code, and modified EnterExit