cleaned and organized batch variables file
Merge branch 'develop'