Cleanup formatting in management