Clean up org formatting