minor tweaks, use a bit more lodash