Refactor morms