Refine these 2 files.