file code cleanup