some more refactoring, preparing to move the editor to editor.js...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>