fixing variable declarations