format files with astyle

It looks like we have been diverging from the astyle formatting for quite a while...