Refractored and Remavenized