Finished some formatting