Also, changed an if(true) then true; else false; code

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>