minor cleanup in lib/file