Refactor IE