Improved seperation of unrelated example code