Fix typos
Change return and yield format