Improve some formatting; broke others