Adjusted variable names for a bit more clarity