reformatted again. Probably prettier now. Should fix parenthesization and whatnot as well as every other purely syntax formatting requirement