Small Refactorings.