Exciting refactorings!

We'll keep working on this more tomorrow, but here's what we've done so far!