Fixed Variable Names and Added More Context