improved formatting in general