Remove unnecessary null check and comment