Cleanup and format sections