simplifying vars

need to make editing quicker, since i revisit this every 6 months..