Nicen up the formatting a bit