Some code cleanup for the example

Include PR #73