Fixing the format