refactoring in Deviations