refactor always refactor