Refactoring presence