Tutorial shaping up

Change-Id: Idb90bd47e867058b58b6bff379bfb1942a78007b