Improve option parsing

[vivaladav]

Replace the wall of if/else with something different (and better). Maybe a map or a hash table.