Catching up with some problems found w.r.t. coding style
Signed-off-by: NLucas Meneghel Rodrigues <lmr@redhat.com>