General format fixing