Final pre-submission revision

Signed-off-by: Helio Perroni Filho <xperroni@gmail.com>