Refactor system