Removed the controller
new beautifyShortcut method
Editor state refactor