even if none of the changes in this function is wrong, I'd prefer to keep it as is (except the else-block).

but don't hesitate to do such changes if you need to change this method next time.