-- style
Improve arguments handling

Trim all string keys on entry