EM: Refactoring