Cleanup of example code