Reduce pointer usage