Rearranging GA code and script tag cleanup