Fix indentation and remove switch-disconnect check in Base Controller case