Made some cleanup in settings.js