Change filename to be non kwarg