Small Refactorings