Quick Settings: Tweaks and code cleanup