Fixing up the format