Add some cosmetic improvement and storing format is [0000000-9999999][A-Z]0-9] for forms