Avoid returning `null`. Prefer `Optional`

In situations where a value might not exist, generally preferable to return values wrapped with a Java `Optional<>` rather than a `null`. It's more self documenting, and generally easier to deal with logic to handle situations where values might be missing.