Minified and some edits to settings