Tiny refactoring

Signed-off-by: Gustavo L. de M. Chaves <gnustavo@cpan.org>