Fixed Even More Formatting Issues