Clean up of command line parser
Clean up of command line parser

 * add some ignoring of coverage where it makes sense
 * remove unused variable
 * rename wrong variable

oz123/bottle,bottlepy/bottle,defnull/bottle,fkazimierczak/bottle,bottlepy/bottle,ifduyue/bottle,Inndy/bottle,ifduyue/bottle,oz123/bottle,fkazimierczak/bottle,defnull/bottle,Inndy/bottle