Little refactorings.