Fixed up a bit more of the example