Improved variable use