Tutorial shaping up

Change-Id: I2cc7f2300d361153f52b3539c667479f4e09dec1