Changed variable names to make it more organized