Code Clean Up and Google Tracking code