Gn gwtp 59

Maybe you could extract the logic which is common to both the classic and the universal analytics?