Updated some formating