Less reliance on globals