some cleanup / additions while writing example