Fixed repetitive variable names