Tweaked code clean-up settings