• Extracted repeated Locale resolution logic into a private method to reduce duplication.
  • Replaced traditional null checks with Optional to improve readability and make null handling more explicit.