minor code changes

Signed-off-by: Fábio André <fabio.a.s.dias@gmail.com>