Some refactorings

Hey there! You said you wanted refactorings, so I spent a few minutes today and went over this. This is 99% how I'd do it.

I kept them small so you can keep what you want and throw out what you don't!