Updated variable names to address their usage