Removed unnecessary "nil?" calls