Refactor long function(s) into smaller methods #2
Description
Some functions in the codebase are performing multiple responsibilities and have grown too long. Please identify these long functions and refactor them by extracting logical blocks into separate, well-named methods. This will improve readability and maintainability.