Improved naming and variable usage