Refactoring code.
Refactoring code.