Move common vars to top