Editors fix

Some cosmetic improvements