diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index c5f8453..ec3e11f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -52,12 +52,12 @@
     @Override
     protected void refresh() {
         if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
-            StringBuilder mTitle = new StringBuilder(mContext.getString(
+            StringBuilder title = new StringBuilder(mContext.getString(
                 R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress()));
             for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) {
-                mTitle.append("\n").append(member.getAddress());
+                title.append("\n").append(member.getAddress());
             }
-            mFooterPreference.setTitle(mTitle);
+            mFooterPreference.setTitle(title);
         } else {
             mFooterPreference.setTitle(mContext.getString(
                 R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index ec5c8dd..b75e02a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -94,7 +94,7 @@
         mPasskeyFormatted = formatKey(mPasskey);
         final CachedBluetoothDevice cachedDevice =
                 mBluetoothManager.getCachedDeviceManager().findDevice(mDevice);
-        mIsCoordinatedSetMember = (cachedDevice != null)
+        mIsCoordinatedSetMember = cachedDevice != null
                 ? cachedDevice.isCoordinatedSetMemberDevice() : false;
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index 013ef52..3cdff6e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -235,7 +235,7 @@
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addPreference() {
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addsPreference() {
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater
                 .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
@@ -248,7 +248,7 @@
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addPreference() {
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addsPreference() {
         mAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater
                 .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index 40b20dc..98f1fe3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -235,7 +235,7 @@
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removePreference() {
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removesPreference() {
         mAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater
                 .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
@@ -248,7 +248,7 @@
     }
 
     @Test
-    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removePreference()
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removesPreference()
     {
         mAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater