Code

Improve option parsing