removing nil checks