Better use of Optional.