Redid some formatting.