Rework logic for less null checks