Improvements.
Remove lodash.
Split up more sensibly.
Remove unnecessary return.