Cleaning up unnecessary nil check