Fixed variabes/methods declaration errors