Getting on the refactor tractor

Getting on the refactor tractor
@ErinJZimmer