Refactors, I'm done.