Feedback2

Here's some more feedback that could get you started down the road of refactoring. I broke up each of my changes into separate commits that each have some more details in the commit message that explain what my thinking was for the change. I'd recommend going through the commits listed below, one at a time starting at the beginning (the one listed below at the top).

The goal throughout these refactorings was to change your methods so that they weren't relying on any preexisting state of your application.

As always, please submit a help request if you want to go over any of these changes.

Oh, and great job :+1: