Updated formatting a bit