Refactor Changes