Change to uniform function ref style