More example code cleanup