Small changes to a better code reading

Signed-off-by: Andre Luiz Viana Loureiro <andre.vl@samsung.com>