Make formatting a little better