Coding style modifications.
Refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>