Fix format + headers