Fix a perfomance issue
Refactor
Refactor
Refactor
Refactor
Refactor
Refactor
Refactor
Refactor