Refactored code.
Refactored code.