improved formatting 2