Changed variable names to be more senseable