more variables, less junk