refractor..

Signed-off-by: Mauro Scomparin <scompo@gmail.com>