Replace elseif by a simple if after a return
Fix typo