refactoring + rc