Clean up, formatting