refactoring options

Signed-off-by: Thiago Rondon <thiago.rondon@gmail.com>