Small changes before creating the editors