(EDITOR) small refactors..