Refactoring.
Refactorign.