Simplifying refac_all