Refactoring.
Commit for version 2.6