EM: Refactor