Updated formatting where borked