Cleanup example class a bit...