Restructured example code to be more sane