Refactor EmailChange class