fix variable declarationsg