REfactor all the things