remove debug print
More modularization of examples