Cleaned up the format a bit.