refactoring anomalies
Merge branch 'refactoring'