Some good old fashioned refucktoring.