refactory file name and format