[IMP] Improve file consistency