refactoring (e_e)