minor
refactor map like streams