[UPDATE] Tutorial boilerplate and some other polishes/refactors