Display settings: Code cleanup