Remove unnecessary code & Edit Settings in a modal
merge conflicts