moved variables

perhaps this does not affect warnings (?)