Refactor controls.