Let us tidy up those messy controllers