cleaning up option parsing