some more variable cleanups and stuff