Used astyle (and manual intervention)
to make the style consistent.