Refactor System [2]