Making the controllers less complex