How refactor even