diff --git a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardError.kt b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardError.kt
index 18fd3d9d3..4f751f0c6 100644
--- a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardError.kt
+++ b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardError.kt
@@ -1,6 +1,5 @@
 package com.paypal.android.cardpayments
 
-import com.braintreepayments.api.BrowserSwitchException
 import com.paypal.android.corepayments.PayPalSDKError
 
 internal object CardError {
diff --git a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardPresentAuthChallengeResult.kt b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardPresentAuthChallengeResult.kt
index f8215e8bd..34bd7aeaf 100644
--- a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardPresentAuthChallengeResult.kt
+++ b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardPresentAuthChallengeResult.kt
@@ -5,4 +5,4 @@ import com.paypal.android.corepayments.PayPalSDKError
 sealed class CardPresentAuthChallengeResult {
     data class Success(val authState: String) : CardPresentAuthChallengeResult()
     data class Failure(val error: PayPalSDKError) : CardPresentAuthChallengeResult()
-}
\ No newline at end of file
+}
diff --git a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardStatus.kt b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardStatus.kt
index ff364e51d..dac1d3e95 100644
--- a/CardPayments/src/main/java/com/paypal/android/cardpayments/CardStatus.kt
+++ b/CardPayments/src/main/java/com/paypal/android/cardpayments/CardStatus.kt
@@ -12,5 +12,5 @@ sealed class CardStatus {
     class VaultSuccess(val result: CardVaultResult) : CardStatus()
     class VaultCanceled(val setupTokenId: String?) : CardStatus()
 
-    object NoResult: CardStatus()
+    object NoResult : CardStatus()
 }
diff --git a/Demo/src/main/java/com/paypal/android/utils/OnNewIntentEffect.kt b/Demo/src/main/java/com/paypal/android/utils/OnNewIntentEffect.kt
index 191a305eb..8866ec4c1 100644
--- a/Demo/src/main/java/com/paypal/android/utils/OnNewIntentEffect.kt
+++ b/Demo/src/main/java/com/paypal/android/utils/OnNewIntentEffect.kt
@@ -19,4 +19,4 @@ fun OnNewIntentEffect(callback: (newIntent: Intent) -> Unit) {
             context.getActivityOrNull()?.removeOnNewIntentListener(listener)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalPresentAuthChallengeResult.kt b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalPresentAuthChallengeResult.kt
index 592b9744a..bec8ca10d 100644
--- a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalPresentAuthChallengeResult.kt
+++ b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalPresentAuthChallengeResult.kt
@@ -5,4 +5,4 @@ import com.paypal.android.corepayments.PayPalSDKError
 sealed class PayPalPresentAuthChallengeResult {
     data class Success(val authState: String) : PayPalPresentAuthChallengeResult()
     data class Failure(val error: PayPalSDKError) : PayPalPresentAuthChallengeResult()
-}
\ No newline at end of file
+}
diff --git a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebStatus.kt b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebStatus.kt
index 1f8c36029..a9d975436 100644
--- a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebStatus.kt
+++ b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/PayPalWebStatus.kt
@@ -12,5 +12,5 @@ sealed class PayPalWebStatus {
     class VaultSuccess(val result: PayPalWebVaultResult) : PayPalWebStatus()
     object VaultCanceled : PayPalWebStatus()
 
-    object NoResult: PayPalWebStatus()
+    object NoResult : PayPalWebStatus()
 }
diff --git a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/errors/PayPalWebCheckoutError.kt b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/errors/PayPalWebCheckoutError.kt
index 33a7de885..01cbba0c0 100644
--- a/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/errors/PayPalWebCheckoutError.kt
+++ b/PayPalWebPayments/src/main/java/com/paypal/android/paypalwebpayments/errors/PayPalWebCheckoutError.kt
@@ -1,6 +1,5 @@
 package com.paypal.android.paypalwebpayments.errors
 
-import com.braintreepayments.api.BrowserSwitchException
 import com.paypal.android.corepayments.PayPalSDKError
 
 internal object PayPalWebCheckoutError {
diff --git a/PaymentButtons/src/main/java/com/paypal/android/paymentbuttons/PaymentButton.kt b/PaymentButtons/src/main/java/com/paypal/android/paymentbuttons/PaymentButton.kt
index eb48bde71..69a0542c8 100644
--- a/PaymentButtons/src/main/java/com/paypal/android/paymentbuttons/PaymentButton.kt
+++ b/PaymentButtons/src/main/java/com/paypal/android/paymentbuttons/PaymentButton.kt
@@ -214,7 +214,7 @@ abstract class PaymentButton<C : PaymentButtonColor> @JvmOverloads constructor(
         visibility = VISIBLE
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         if (shape == PaymentButtonShape.PILL && shapeHasChanged) {
             shape = PaymentButtonShape.PILL // force update since PILL is dependent on view height.
         }