Clean up Formatting