more refac