Reindent the code to make it consistent and readable

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>