Arrowhead take 2

Hey Blake,
Implemented the changes you were looking for I think,

Totally agree with the comment you made about overkill.  I knew what I was doing, I just kept going because it was practice for me.  I just could not stand the nested collection.  Normally, I would just break up the large method and move on.  The key to refactoring is restraint, because you can definitely go down the rabbit hole like I did.

Anyway, let me know what you think.

Thanks!