some cleanup and finished tutorial