Simplify negative nil return condition by using (when ...)

Put the verb and nouns in their correct position using thread macro