Tidy some formatting