Refactorz the schnizzle