changed some variable declarations