Bug fix old format option crop and reformat code