Format a little better