More cleanup
Update file reporting script