Updated some formatting