Refactored.
Refactored.