- refactoring end improvements for Swift 6