Stable refactoring reached