ContextRework: REFACTORING