Variables tightened up and array themes created