Everything reformatted with AStyle