Move GA code out of conditional