Improve formatting in org