(feat) #noticket Formatting fixes