Publishing UI (editor) + clean up code