updated variables, cleanup