Refactorings for simplicity