Remove tutorial code
Paramterize Main further