Update "Use flat_map instead of map + flatten"

See [Issue:143]