Option parser improoving