Refactored for readability

I really only found a few things that I thought could be a bit more readable, so I will understand if you want to reject this.

All provided tests are passing.

There were two operational changes (lines 60/60 and 82/80) where Array#map was being used when only Array#each was needed.

Thanks!  This is my first open source contribution, and I enjoyed the practice!