[Improvement] Proper arg management

Edited by Mathieu Valois