Applying refac_all as much as possible