Make formatting consistent

The formatting inconsistencies got out of control in no time
due to my bouncing between editors on different platforms. So
this commit is a result of:
    astyle -n --style=kr *cc *h