Improved variable naming, prompted by a comment from Julian Birch