minor cleanup + tutorial improvement