second iteration of cleaning up file utils