What kind of refactor you purpose?