Some refactorings.
Some refactorings.