minor reordering of file