refactored remaining __ => _i