1. Remove unused return value
  2. Add Nullable annotaions
  3. Simplify if statement

Comment From: divcon

@sbrannen Thank you for your review. I reflected your review.

Comment From: sbrannen

This has been merged into main in c12d93c5d1696fc030b7b2fc0fb999b99795c59c and revised in a832c98cedc56690ad606b53f497814370792d12.

Thanks