Fixed Some More Formatting Issues