Refactor controls