Fixed some double variable declarations