align code/comments with tutorial in wiki