Minor Controllers Code improvements

Minor Controllers Code improvements