added google ecommerce
refactored a bit
refactored a bit