Apply astyle -A2 -j -S to all source files
Merge branch 'format'

Clean up format.