refact...

Signed-off-by: Marcio Mangar <marcio.mangar@gmail.com>