combined some more variable declarations