tidy up and add google tracking