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