Main: small cleanup

Signed-off-by: Eduardo Silva <eduardo.silva@oracle.com>