Refacto

I just needed some space. Couldn't breathe.