coding style  + removed not used options