Clean option parsing related code