refactor: Use the elvis operator + fix: Handle null checks with the ?? operator

refactor: Use the elvis operator + fix: Handle null checks with the ?? operator #856