File reorder cleanup