Improved the variable naming to better match usage and type