Further cleanup in example