Refactoring.
Improve performance.