Comments + renaming for tutorials