adjust variable declarations