Finished the Formatting