updates, improve stylistic consistency with tutorial