Improved variable usage