Refactor

Signed-off-by: Eduardo L. Buratti <elb09@c3sl.ufpr.br>