improved the formatting a bit again