Finished Fixing Formatting