Renamed var and changed style on the null check per feedback