Refactor RadController