Refactoring

Derp.