Added variables file and some clean up