sr refactor