removing None check