Make more better the argument parsing