Refactoring in WindowManager settings
Cleanups