oops - fix refactoring of variables