Adding review comments removing 'is None' as not