Refactor code structure and remove redundant code blocks for improved readability and maintainability

support bot minor fixes

added