Little refactorings