Refactoring flag