Minor changes
Removed 'is_nil'.