Second round of AStyle formatting