Moved variables to one file