Refactoring.
1.9.17