Reworked formating