Finally Fixed AutoFormatting