The existing code looks correct to me. An `else` on a for loop will execute if there's no break. In this case it breaks if there's a separator in the sortname, and if it can't find one it returns the sortname untouched. Moving the `else` to the `if` clause doesn't really make sense because it hasn't even looked for a separator yet. Moving the `return` statement will also cause the main loop to never check any character beyond the first one.