Make code a bit more sane and uncrustify