Changed yield map to public
Tidied up lazy comprehension
Tided up eager comprehension