Change from `map` => `map!` and `collect!` to save creation of extra array

Change from `map` => `map!` and `collect!` to save creation of extra array.