redid some formatting