Refactored Editor.js and Spread.js