Clean up and add google analytics