improved formatting