Numerous formatting fixes