Cascading controls refactoring