Refractoring

So bad.