Fixes: 1) Resolved redundant lines and formatting inconsistencies across multiple files; 2) Corrected Collection typing imports and Optional replacements with union types (e.g., `str | None`);
Extra: Improved formatting and readability by consolidating single-line code sections and simplifying expressions.
