Clean up some stuff
Adjusting some part of tutorial to Dan's suggestions