Refractoring 0.01