Tidied up how editors are handled