Several indentation issues were solved, also some style was applied
to improve code's readability.
No functionality changes were done.
Story: 2006425
Task: 36322
Change-Id: I908ce18cb68ddcb96239866e720a82757a058691
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>