Clean up and formatting