moved variables to variables