(#1746) - don't use map when we mean forEach
(#1533) - fix maxlen=80
Merge pull request #1 from daleharvey/1533-maxlen-small-squashed

(#1533) - maxlen small squashed