### What problem does this PR solve? ### Type of change - [x] Refactoring - [x] Performance Improvement