Refactored post code review of BluetoothClient