Removed uses of non-functional ?? (null coalescing operator)