Remove bashism
Remove useless quote
Add an arguments shift if needed