Added option.size test
Added unnessary if test