Refactoring of particular cases