some cleanup of second tutorial level