cleaned up file order