Updated formatting for a few things