Address code review comments:

  1) Prefer Options over null.
  2) Prefer == over equals.
  3) Don't use explicit returns.