Code Review Corrections

Signed-off-by: Mario <mario.perez@jalasoft.com>