Additional automated Formatting