Refactor Control